Revert change in default of side-window-bottom

Not happy with the look of it yet, even though it's probably better to
avoid the echo area

diff --git a/README.org b/README.org
index bf56704cdfc7552653b4f053dbe7a1fd99a33c68..f785d2024e11472dd3985ee3c5399409b22613e0 100644 (file)
--- a/README.org
+++ b/README.org
@@ -1,17 +1,6 @@
 * which-key 
 [[http://melpa.org/#/which-key][http://melpa.org/packages/which-key-badge.svg]] [[http://stable.melpa.org/#/which-key][file:http://stable.melpa.org/packages/which-key-badge.svg]]
 ** What's New
-- Implemented =bottom= as an option for =which-key-show-prefix=, which will show
-  the key, page number, and next page key information on the last line of the
-  which-key buffer.
-- This is the new default for =which-key-setup-side-window-bottom=. The old
-  default, which is still available, used the echo area for this information.
-  The echo area is not a good default, because it's not possible to completely
-  control what shows there without doing something ugly, so occasionally the
-  which-key information will be overwritten. To restore the old default simply
-  #+BEGIN_SRC emacs-lisp
-  (setq which-key-show-prefix 'echo)
-  #+END_SRC
 - The function =which-key-show-top-level= was implemented by @iqbalansari
   (thanks!) to show top-level key bindings (those not behind a prefix). You can
   use =M-x which-key-show-top-level= to try it and bind it to a key if you like.

diff --git a/which-key.el b/which-key.el
index 016536fefb3eeebff12cf9ed0c81ffbd2a5b5591..5e68f5c4cdae3c45b0b65f21f4853c319ba6ae6e 100644 (file)
--- a/which-key.el
+++ b/which-key.el
@@ -164,7 +164,7 @@ and nil. Nil turns the feature off."
   :group 'which-key
   :type 'integer)
 
-(defcustom which-key-side-window-location 'bottom
+(defcustom which-key-side-window-location 'echo
   "Location of which-key popup when `which-key-popup-type' is side-window.
 Should be one of top, bottom, left or right. You can also specify
 a list of two locations, like (right bottom). In this case, the
@@ -565,7 +565,7 @@ bottom."
   (interactive)
   (setq which-key-popup-type 'side-window
         which-key-side-window-location 'bottom
-        which-key-show-prefix 'bottom))
+        which-key-show-prefix 'echo))
 
 ;;;###autoload
 (defun which-key-setup-minibuffer ()